283. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:43:07 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

283.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout_checkout.less2021-02-04 08:07:52 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout_checkout.less2021-02-04 08:07:52 +0000

283.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1254
Changed00
Inserted00
Removed00

283.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

283.4 Active regular expressions

No regular expressions were active.

283.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //  Variables 7 //  Variables
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 @checkout-wrapper__margin: @indent__base; 10 @checkout-wrapper__margin: @indent__base;
11 @checkout-wrapper__columns: 16; 11 @checkout-wrapper__columns: 16;
12  12 
13 @checkout-step-title__border: @border-width__base solid @color-gray80; 13 @checkout-step-title__border: @border-width__base solid @color-gray80;
14 @checkout-step-title__font-size: 1rem; 14 @checkout-step-title__font-size: 1rem;
15 @checkout-step-title__font-weight: @font-weight__light; 15 @checkout-step-title__font-weight: @font-weight__light;
16 @checkout-step-title__padding: @indent__s; 16 @checkout-step-title__padding: @indent__s;
17  17 
18 @checkout-step-title-mobile__font-size: 1rem; 18 @checkout-step-title-mobile__font-size: 1rem;
19  19 
20 @checkout-step-content-mobile__background: @color-gray-light01; 20 @checkout-step-content-mobile__background: @color-gray-light01;
21 @checkout-step-content-mobile__margin-s: 15px; 21 @checkout-step-content-mobile__margin-s: 15px;
22 @checkout-step-content-mobile__margin: @indent__base -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s; 22 @checkout-step-content-mobile__margin: @indent__base -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s;
23  23 
24 // 24 //
25 //  Common 25 //  Common
26 //  _____________________________________________ 26 //  _____________________________________________
27  27 
28 & when (@media-common = true) { 28 & when (@media-common = true) {
29  29 
30     .checkout-index-index, 30     .checkout-index-index,
31     .checkout-onepage-success { 31     .checkout-onepage-success {
32         .page-title-wrapper { 32         .page-title-wrapper {
33             &:extend(.abs-visually-hidden all); 33             &:extend(.abs-visually-hidden all);
34         } 34         }
35     } 35     }
36  36 
37     .checkout-container { 37     .checkout-container {
38         &:extend(.abs-add-clearfix all); 38         &:extend(.abs-add-clearfix all);
39         .lib-css(margin, 1.5rem 0 @checkout-wrapper__margin); 39         .lib-css(margin, 1.5rem 0 @checkout-wrapper__margin);
40     } 40     }
41     .checkout-success { 41     .checkout-success {
42       padding: 30px 0; 42       padding: 30px 0;
43     } 43     }
44     .cart-empty { 44     .cart-empty {
45       i.cart-empty { 45       i.cart-empty {
46           font-size: 100px; 46           font-size: 100px;
47           color: #d3d3d4; 47           color: #d3d3d4;
48       } 48       }
49       .btn-go-shop { 49       .btn-go-shop {
50         min-width: 200px; 50         min-width: 200px;
51         padding: 16px 0; 51         padding: 16px 0;
52         font-size: 15px; 52         font-size: 15px;
53         letter-spacing: -.015em; 53         letter-spacing: -.015em;
54         text-align: center; 54         text-align: center;
55         color: #fff; 55         color: #fff;
56         background-color: #222529; 56         background-color: #222529;
57         border: none; 57         border: none;
58         line-height: 1.5; 58         line-height: 1.5;
59         font-weight: 700; 59         font-weight: 700;
60         text-transform: uppercase; 60         text-transform: uppercase;
61         display: inline-block; 61         display: inline-block;
62       } 62       }
63     } 63     }
64     .opc-wrapper { 64     .opc-wrapper {
65         .lib-css(margin, 0 0 @checkout-wrapper__margin); 65         .lib-css(margin, 0 0 @checkout-wrapper__margin);
66         .opc { 66         .opc {
67             &:extend(.abs-reset-list all); 67             &:extend(.abs-reset-list all);
68         } 68         }
69  69 
70         .step-title { 70         .step-title {
71             &:extend(.abs-checkout-title all); 71             &:extend(.abs-checkout-title all);
72             text-transform: uppercase; 72             text-transform: uppercase;
73             font-weight: 600; 73             font-weight: 600;
74             color: #222529; 74             color: #222529;
75             .lib-css(border-bottom, @checkout-step-title__border); 75             .lib-css(border-bottom, @checkout-step-title__border);
76         } 76         }
77  77 
78         .step-content { 78         .step-content {
79             margin: 0 0 @indent__xl; 79             margin: 0 0 @indent__xl;
80         } 80         }
81     } 81     }
82  82 
83     .checkout-index-index { 83     .checkout-index-index {
84         .logo { 84         .logo {
85             margin-left: 0; 85             margin-left: 0;
86         } 86         }
87     } 87     }
88 } 88 }
89  89 
90 // 90 //
91 //  Mobile 91 //  Mobile
92 //  _____________________________________________ 92 //  _____________________________________________
93  93 
94 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 94 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
95     .opc-wrapper { 95     .opc-wrapper {
96         .step-title { 96         .step-title {
97             .lib-css(font-size, @checkout-step-title-mobile__font-size); 97             .lib-css(font-size, @checkout-step-title-mobile__font-size);
98             border-bottom: 0; 98             border-bottom: 0;
99             padding-bottom: 0; 99             padding-bottom: 0;
100         } 100         }
101         .step-content { 101         .step-content {
102             .lib-css(margin, 0 0 @checkout-step-content-mobile__margin-s); 102             .lib-css(margin, 0 0 @checkout-step-content-mobile__margin-s);
103         } 103         }
104     } 104     }
105 } 105 }
106 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 106 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
107     .checkout-index-index { 107     .checkout-index-index {
108         .page-header .minicart-wrapper { 108         .page-header .minicart-wrapper {
109             display: none; 109             display: none;
110         } 110         }
111     } 111     }
112     .page-header.type5 .block-search .label { 112     .page-header.type5 .block-search .label {
113         margin-right: 0; 113         margin-right: 0;
114     } 114     }
115 } 115 }
116 // 116 //
117 //  Desktop 117 //  Desktop
118 //  _____________________________________________ 118 //  _____________________________________________
119  119 
120 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 120 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
121     .opc-wrapper { 121     .opc-wrapper {
122        &:extend(.abs-add-box-sizing-desktop-m all); 122        &:extend(.abs-add-box-sizing-desktop-m all);
123         .lib-layout-column(2, 1, @checkout-wrapper__columns); 123         .lib-layout-column(2, 1, @checkout-wrapper__columns);
124         width: 66%; 124         width: 66%;
125         padding-right: @indent__l; 125         padding-right: @indent__l;
126     } 126     }
127 } 127 }